From ce4fd7cb2f458c1b847d6c01df17c61495f8d8fb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 14 Feb 2016 17:07:44 +0100 Subject: [PATCH] Cosmetic fixes to make_orig_multi.sh --- debian/make_orig_multi.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/make_orig_multi.sh b/debian/make_orig_multi.sh index a618394fd..2df1b45ff 100755 --- a/debian/make_orig_multi.sh +++ b/debian/make_orig_multi.sh @@ -1,7 +1,9 @@ #!/bin/sh set -e +echo "" echo "This needs a local copy of cargo-vendor, and the following packages:" echo "python-dulwich python-pytoml devscripts" +echo "" TMPDIR=`mktemp -d` echo "Using '${TMPDIR}'..." @@ -24,7 +26,7 @@ fi; BOOTSTRAP_PY=$(find "${PWD}" -name bootstrap.py -type f) DEPS_FILTER=$(find "${PWD}" -name deps-tarball-filter.txt -type f) -# Download cargo tarballs +# Download cargo tarball uscan --rename ${USCAN_ARGS} --force-download --destdir "${TMPDIR}/" # Extract cargo source @@ -34,6 +36,8 @@ tar -xaf "${TMPDIR}/cargo_${CARGO_VER}.orig.tar.gz" -C cargo --strip-components= cd cargo # Trim the list of dependencies +echo "" +echo "Applying clean-cargo-deps.patch... If this fails, remember to refresh the patch first!" patch -p1 < ${WORKDIR}/debian/patches/clean-cargo-deps.patch # Download build-deps via cargo-vendor -- 2.30.2